From aa8bebd5a643757f6ac62fb24ad9d772dc2699b5 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Thu, 1 Aug 2013 04:02:54 +0000
Subject: [PATCH] Let xml_parse_time take a QString&.

---
 gpsbabel/defs.h | 2 +-
 gpsbabel/gpx.cc | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index b06760428..33529610f 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -1021,7 +1021,7 @@ const char* get_filename(const char* fname);			/* extract the filename portion *
 #define str_iso8859_1_to_utf8(str) cet_str_iso8859_1_to_utf8((str))
 
 /* this lives in gpx.c */
-gpsbabel::DateTime xml_parse_time(const char* cdatastr);
+gpsbabel::DateTime xml_parse_time(const QString& cdatastr);
 
 xml_tag* xml_findfirst(xml_tag* root, const char* tagname);
 xml_tag* xml_findnext(xml_tag* root, xml_tag* cur, const char* tagname);
diff --git a/gpsbabel/gpx.cc b/gpsbabel/gpx.cc
index 8eb6cf01c..daab6eba8 100644
--- a/gpsbabel/gpx.cc
+++ b/gpsbabel/gpx.cc
@@ -843,14 +843,14 @@ gs_get_container(geocache_container t)
 }
 
 gpsbabel::DateTime
-xml_parse_time(const char* cdatastr)
+xml_parse_time(const QString& dateTimeString)
 {
   int off_hr = 0;
   int off_min = 0;
   int off_sign = 1;
   char* offsetstr = NULL;
   char* pointstr = NULL;
-  char* timestr = xstrdup(cdatastr);
+  char* timestr = xstrdup(dateTimeString.toUtf8().data());
 
   offsetstr = strchr(timestr, 'Z');
   if (offsetstr) {
@@ -905,11 +905,11 @@ xml_parse_time(const char* cdatastr)
     // Any offsets that were stuck at the end.
     time = time.addSecs(-off_sign * off_hr * 3600 - off_sign * off_min * 60);
 
-    xfree(timestr);
     dt = QDateTime(date, time, Qt::UTC);
   } else {
     dt = QDateTime();
   }
+  xfree(timestr);
   return dt;
 }
 
-- 
2.30.2